wayland: Don't add/remove displays manually

This code is handled by GdkDisplay itself these days.

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 1f1f413ef56914a931a2a2df0c332dce287f69d2..3a80d0a9a154d511b61a93b8051600194ceaaf94 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -260,8 +260,6 @@ gdk_wayland_display_dispose (GObject *object)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (object);
 
-  _gdk_wayland_display_manager_remove_display (gdk_display_manager_get (),
-                                              GDK_DISPLAY (display_wayland));
   g_list_foreach (display_wayland->input_devices,
                  (GFunc) g_object_run_dispose, NULL);
 
@@ -613,9 +611,6 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass * class)
 static void
 gdk_wayland_display_init (GdkWaylandDisplay *display)
 {
-  _gdk_wayland_display_manager_add_display (gdk_display_manager_get (),
-                                           GDK_DISPLAY (display));
-
   display->xkb_context = xkb_context_new (0);
 }
 

diff --git a/gdk/wayland/gdkdisplaymanager-wayland.c b/gdk/wayland/gdkdisplaymanager-wayland.c
index 32b201810c1bbfdca806ed50ad876a3238ba69b9..139f4ed8e0b879be90bf02786e8edae755423991 100644 (file)
--- a/gdk/wayland/gdkdisplaymanager-wayland.c
+++ b/gdk/wayland/gdkdisplaymanager-wayland.c
@@ -101,31 +101,3 @@ gdk_wayland_display_manager_init (GdkWaylandDisplayManager *manager)
 {
 }
 
-void
-_gdk_wayland_display_manager_add_display (GdkDisplayManager *manager,
-                                         GdkDisplay        *display)
-{
-  GdkWaylandDisplayManager *manager_wayland = GDK_WAYLAND_DISPLAY_MANAGER (manager);
-
-  if (manager_wayland->displays == NULL)
-    gdk_display_manager_set_default_display (manager, display);
-
-  manager_wayland->displays = g_slist_prepend (manager_wayland->displays, display);
-}
-
-void
-_gdk_wayland_display_manager_remove_display (GdkDisplayManager *manager,
-                                            GdkDisplay        *display)
-{
-  GdkWaylandDisplayManager *manager_wayland = GDK_WAYLAND_DISPLAY_MANAGER (manager);
-
-  manager_wayland->displays = g_slist_remove (manager_wayland->displays, display);
-
-  if (gdk_display_manager_get_default_display (manager) == display)
-    {
-      if (manager_wayland->displays)
-        gdk_display_manager_set_default_display (manager, manager_wayland->displays->data);
-      else
-        gdk_display_manager_set_default_display (manager, NULL);
-    }
-}

diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index 7aefedb25375cd8bb8c115c78dddea2e9a194112..43d1c3d93d4875228c365505982000dafbae9b48 100644 (file)
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -167,11 +167,6 @@ void _gdk_wayland_screen_remove_output (GdkScreen *screen,
 int _gdk_wayland_screen_get_output_refresh_rate (GdkScreen        *screen,
                                                  struct wl_output *output);
 
-void _gdk_wayland_display_manager_add_display (GdkDisplayManager *manager,
-                                              GdkDisplay        *display);
-void _gdk_wayland_display_manager_remove_display (GdkDisplayManager *manager,
-                                                 GdkDisplay        *display);
-
 void _gdk_wayland_window_set_device_grabbed (GdkWindow      *window,
                                              GdkDevice      *device,
                                              struct wl_seat *seat,